From: Hannu Nyman Date: Wed, 21 Jun 2023 14:44:25 +0000 (+0300) Subject: treewide: fix weblate conflicts X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=3b9adf800f6d93ec639577fc1f93ad841f841f1f;p=project%2Fluci.git treewide: fix weblate conflicts Merge remote-tracking branch 'weblate/master' Signed-off-by: Hannu Nyman --- 3b9adf800f6d93ec639577fc1f93ad841f841f1f